Skip to content

wifi: Move EB2 shield to upstream #25840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

wifi: Move EB2 shield to upstream #25840

wants to merge 2 commits into from

Conversation

@krish2718
Copy link
Contributor

@krish2718 krish2718 commented Nov 26, 2025

Pull upstream shield and remove from downstream.

@krish2718
manifest: sdk-zephyr: Pull new shield nRF7002EB-II
d7b12de 
This is now moved to upstream.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718
boards: shields: nrf7002eb2: Remove from downstream
9c86170 
Use the upstream shield directly.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718 krish2718 added this to the 3.2.0 milestone Nov 26, 2025
@krish2718 krish2718 requested review from a team as code owners November 26, 2025 20:03
@NordicBuilder NordicBuilder added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Nov 26, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 26, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@f316ea6 nrfconnect/sdk-zephyr#3546 nrfconnect/sdk-zephyr#3546/files

⛔ DNM label due to: 1 project with PR revision

Note: This message is automatically posted and updated by the Manifest GitHub Action.

Copilot finished reviewing on behalf of krish2718 November 26, 2025 20:05
Copilot AI reviewed Nov 26, 2025
View reviewed changes
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR moves the nRF7002-EB II (nrf7002eb2) shield configuration from the downstream NCS repository to upstream Zephyr by removing all downstream shield files and updating the Zephyr revision to pull the upstream implementation.

  • Removes all nrf7002eb2 shield files from the downstream repository (overlays, device tree includes, and Kconfig)
  • Updates Zephyr revision to pull the upstream shield implementation

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
west.yml Updates Zephyr revision to reference upstream PR containing the shield
boards/shields/nrf7002eb2/nrf7002eb2_nrf7001.overlay Removes nRF7001 variant overlay (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2_nrf7000.overlay Removes nRF7000 variant overlay (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_2.dtsi Removes GPIO pin configuration for variant 2 (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_1.dtsi Removes GPIO pin configuration for variant 1 (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2_common_5g.dtsi Removes 5GHz power configuration (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2_common.dtsi Removes common shield configuration (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2_coex.overlay Removes coexistence overlay (moved to upstream)
boards/shields/nrf7002eb2/nrf7002eb2.overlay Removes main nRF7002 overlay (moved to upstream)
boards/shields/nrf7002eb2/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay Removes nRF54LM20 DK board-specific configuration (moved to upstream)
boards/shields/nrf7002eb2/boards/nrf54l15dk_nrf54l15_cpuapp.overlay Removes nRF54L15 DK board-specific configuration (moved to upstream)
boards/shields/nrf7002eb2/Kconfig.shield Removes shield Kconfig definitions (moved to upstream)

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

west.yml
- name: zephyr
repo-path: sdk-zephyr
revision: f316ea6f7080c448f423f68b44a0f6fe78d7f455
revision: pull/3546/head
Copy link

Copilot AI Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The revision is set to a pull request reference (pull/3546/head) rather than a commit SHA or tag. Pull request references are temporary and will be deleted once the PR is merged or closed, which will cause builds to fail.

This should be changed to either:

  • A specific commit SHA once the upstream PR is merged
  • A branch name or tag reference if appropriate

Temporary PR references should only be used for testing purposes, not in the main branch.

Suggested change
revision: pull/3546/head
revision: <commit-sha>

Copilot uses AI. Check for mistakes.
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Nov 26, 2025 •
edited
Loading

CI Information

To view the history of this post, click the 'edited' button above
Build number: 2

Inputs:

Sources:

sdk-nrf: PR head: 9c861700718c736657435b41c94e30456f1e2c5d
zephyr: PR head: 1b6806a8f57ca8c99f3251683f910f2d08181c19

more details

sdk-nrf:

PR head: 9c861700718c736657435b41c94e30456f1e2c5d
merge base: 19ac34fdce7bfc1a923ed1853cabb0f6fe5e87bd
target head (main): aec0909ee18f88c76076aceb2bc10358cbb61f0d
Diff

zephyr:

PR head: 1b6806a8f57ca8c99f3251683f910f2d08181c19
merge base: f316ea6f7080c448f423f68b44a0f6fe78d7f455
target head (main): 71ebd2b14110f5d9fa3cd23873df0d25c276611b
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (30) 
boards
│  ├── shields
│  │  ├── nrf7002eb2
│  │  │  ├── Kconfig.shield
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │ nrf54lm20dk_nrf54lm20a_cpuapp.overlay
│  │  │  ├── nrf7002eb2.overlay
│  │  │  ├── nrf7002eb2_coex.overlay
│  │  │  ├── nrf7002eb2_common.dtsi
│  │  │  ├── nrf7002eb2_common_5g.dtsi
│  │  │  ├── nrf7002eb2_gpio_pins_1.dtsi
│  │  │  ├── nrf7002eb2_gpio_pins_2.dtsi
│  │  │  ├── nrf7002eb2_nrf7000.overlay
│  │  │  │ nrf7002eb2_nrf7001.overlay
west.yml
zephyr
│  ├── boards
│  │  ├── shields
│  │  │  ├── nrf7002eb2
│  │  │  │  ├── Kconfig.shield
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │  │ nrf54lm20dk_nrf54lm20a_cpuapp.overlay
│  │  │  │  ├── doc
│  │  │  │  │  │ index.rst
│  │  │  │  ├── nrf7002eb2.overlay
│  │  │  │  ├── nrf7002eb2_coex.overlay
│  │  │  │  ├── nrf7002eb2_common.dtsi
│  │  │  │  ├── nrf7002eb2_common_5g.dtsi
│  │  │  │  ├── nrf7002eb2_gpio_pins_1.dtsi
│  │  │  │  ├── nrf7002eb2_gpio_pins_2.dtsi
│  │  │  │  ├── nrf7002eb2_nrf7000.overlay
│  │  │  │  │ nrf7002eb2_nrf7001.overlay
│  ├── doc
│  │  ├── releases
│  │  │  │ migration-guide-4.4.rst
│  ├── soc
│  │  ├── nordic
│  │  │  ├── nrf54h
│  │  │  │  ├── bicr
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │ Kconfig
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── host
│  │  │  │  ├── Kconfig
│  │  │  │  ├── keys.c
│  │  │  │  │ smp.c

Outputs:

Toolchain

Version: 4e36fbc961
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:4e36fbc961_5ea73affbf

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 1
  • ✅ Integration tests
    • ✅ test-sdk-audio - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test_ble_nrf_config - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ble_samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-chip - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rs - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-thread-main - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-wifi - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
    • ⚠️ test-fw-nrfconnect-nrf-iot_cloud
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • desktop52_verification
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-ps-main
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-tfm
    • test-low-level
    • test-sdk-mcuboot
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@tejlmand tejlmand tejlmand approved these changes

@sachinthegreen sachinthegreen sachinthegreen approved these changes

@bama-nordic bama-nordic Awaiting requested review from bama-nordic

Assignees

No one assigned

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. DNM manifest manifest-zephyr

Projects

None yet

Milestone

3.2.0

Development

Successfully merging this pull request may close these issues.

4 participants

@krish2718 @NordicBuilder @tejlmand @sachinthegreen